Fixing 1189

This should fix the problem described in Fixing #1189: Deadlock .. somewhere? (probably serialization)