Stop forced closures

Stop forced closures