Autoclose option didn't work with delegation

Needed for roller