Fix unit movement. For the last time, null !== undefined