Fixed #584