couple fixes for [#135]