'@@' suffixes, off-by-one cmd fix