Likely a side effect of #549 
Likely a side effect of #549