Fixed bug due to overlapping word config defines