Fixed: returning object instance