Attempt to fix build script properly this time