Fix for issue #470