fix bug in ac265970f4