I think we should address this remaining issue in another patch