fixing up the return values