Stop being lazy and fix it the right way