Merge pull request #117 from oxylusengine/vbgtao_fix