try to fix concurrent execution