[WO-567] Fix this/self fail