fixes to the previous commit