fixing the stuff