Fixed some critical behaviour
Corrected bahviour