Fixing dotless-i issue

Fixes #1542