Fixed scope / mutability issue across callback