Fix reference to current_system before assignment.