Add extra handling for x mode