closes #524