Bugfix (out of scope callback)