Fix conditional closure