Fix for critical issue #583