Fixed listing index bug