Finally fix the issue with cats trying to move on another cat