Resolved two XXX's