Fix bugs: show wrong locations