Fixing up return methods