I'll address this issue in a separate PR.