TEMP: Check for races afterwards