Fixed Race-Condition