Changes for stringification bug fix