Fix for local closures