-fixes for prev commit