You're right, wil make this change in the other PR.