BUG: fixed issue #44