Fix a simple deadlock that was introduced _right_ before this code got merged