Fixed object instances being returned.
Revert changes...