Fix object return value