closes #523