Callbacks with closures fixed