Fix for other languages