Fixed a language bug workaround, added module