Entry number assignment fixed so now it work properly