fix asynchrony eventual problems