Bug #12662 - fix object return