closes #549