Woops, fix a lockup from the last update