If it's broke, fix it!