Agree, but it could be refactored only after PR 1154 merged