fix multiple definitions
Merge branch 'hotfixes'