I could send a separate PR to address this issue?