EntryHandler Fix