#136 fixes for prev commit