Fix namespace issue in Resolute (just like AGREE issue)