crack at fix minus commenting