fix some more condition
fix some moar condition