Fix for issue #400