fixng issue