Unbreaking build