Fixed an entry conflict