make it work with ace no-conflict build
Merge pull request #1 from utensil/master

make it work with ace no-conflict build