Fix for issue #420