Fix for issue #435