Fixing make-closure