roll-back commit

To the version before Vasil Gudzhev's commit