fix breakage after pull from master