Race fix (with dark magic)