Sounds like we should fix the lock class instead?