"Cannot refer to non-final variable" fix

> Same old, same old
> Cannot refer to non-final variable inside an inner class defined in a
different method