Fix #584