closes #584