closes #582