Fix for issue #28