fix the stuff