Fixing of extension case issue (1st step)
Fixing of extension case issue (2nd step)