BUG: fixed issue #126