Lang bugfixing