Partially rollbacks #270
Merge pull request #271 from yurydelendik/fix270

Partially rollbacks #270