Attempt to fix broken build #2