Changed the place of the fix so it will always kick in