Fixed: $@ gets overwritten by further code if used by itself in an expression