fixed bug in comment handling