Fix for compiler tags breaking in certain situations