Fixed issue with 'undefined' comments