@paulyoung This may be relevant to #264