[FOLD] Fix hang on exit in Overlay