Keep-Builder-Happy