Merge pull request #559 from Nekotekina/master

Build fix