- Fix command suggestion offset (from upstream)