Fix  issue #28