Ok, I changed it as part of the same PR and used the helper.