Temporary fix for C* 2.1.0 race condition