fixes for the previous commit