Fix for issue #434