Deadlock probably has something to do with this change