[mod] remove a now solved situation
[enh] handle special case
[enh] another case for winkler
[enh] those special cases are driving me crazy
[enh] more cases