Made some fix