Fixing closure handling