Little fix: future todo + changed language specific line of code to be more generic