Improved the fix for issue #584 even further ;-)