fixing concurrencies issues in boom