closes #497