Issue #250 fixed