Pick up the entry fix before further modifications.