I agree but this change is not good for this pull request. Please @patrys add this as separate issue.