Fix for issue #409