Updated fix for broken language support

This applies to both normal and inline modes