I'll submit this change in another PR