I can create PR for this issue, but I'm new here so I'm not sure how I can do so. It seems I should open issue first, so I'm opening this one !