fixed returned problem