Fixng issue