fixes to the previous