closes #564