closes #492