closes #574