I think so, I can address that in my next PR