Fix regression bug