Fix issue with context being overriden by self