fix instance
fix race condition