Fixed bug with newer languages