Make return value consistent