Fixed building issue
Merge branch 'hacking'