fix critical point issues