closes #503