Fixes totally