Fixed reference to self used inside closure