Dos and Dont's fix