Fix a bug
Refactor for member cursor