Fixed overflow bug with entrylist