fixed closure issues with last commmit