Fixing self ref