- Solved problem with compatibility for old version (<2.0)