Likely a side effect of #549 