fixed view-change bug reported on the list