fixed defines handling