fixes to the previous commit, my bad