Fix segfault in "x"@y command