Fixed return type on FindByObjectId