fix closures