closes #534