revert Makefile and fix back