closes #525