fix one big which caused infinite loop