Issue #130 fixed