Fix for issue #239