#1217 repaired issue with missing defines