Alrighty, fix it up!