Hmm.. having the locks ordered wrong still shouldn't cause a deadlock...