Merge "Avoid a building error"