Fix for issue #467