fixed among other issue #37 and #33