temp fix for race cond