bug fix on language