Fixed return of the same object bug