Fix for closure