refs bug #584