Fix for issue #430