Fix for DeadLock???!!?!