406617 fixed close handling during content