[mod] refactory shitty cases section
[enh] handle new shitty case