Added workaround for .com key (ESS-184)