[FIX] ugly race condition hack