Fix #2581 (fix /untell completion)