fix for issue #28