Flag fix

Conflicts:
	Makefile