Fixed to work with EzLanguage v0.3