Fix for the stuff that happened