Trying to fix broken build