fix(core): Small issue with comment counter overriding original code line values