Temporary fix for the race-condition