Fixed: Master is broken for new install