BUG: fixed issue #136, #125