Another attempt at a makefile fix