Changed which variable is converted for issue in last commit