Fix of Issue #528

I tested the case matching and it works