Fixed build with 5.2 to 5.4
Fixed primary define