fix bad merge
Merge pull request #507 from Alexx999/dev

fix bad merge