Fix object population