fixed returned values