It's already done in next PR: #143