Fixed SMP Compatibility