Prospective build fix for the Makefile system