fix #584