fixes bug #584