Fixng the code