Fixing the stuff