Fix build
Merge pull request #368 from ovatsus/master

Fix build