Fix support for other languages