Fixed issue #29