Pull in make fix

I'm probably doing this the wrong way.