Trunk 3884. Error here. Please code review.