FUCKING FIXES