Fixed issue #28