Also I believe that this can be a good issue/PR in master branch