some bad return values were remaining..