We have already PRs pending merge that fix this in proper way, so adding this now, yet not properly, is not correct.