Fix for issue #29