Fix for issue #423