fix critical point issue and comment