closes #519