I think this resolves #162