Quick hotfix.

Done quick code for extensions workaround and fixed quote bug.