fix Prev/NextCommand