Begin build recovery fix 6