Address failure with build 171