10.6 some entry bug fixed