fixed asyncronous checkup and collapsing