Fixed language handling on the program