Correction bugID#718 bugID#719 bugID#721