Hopefully fixed a problem with certain compilers about flag ordering