Save order of comments

Please check if it don't break anything, with this fix we don't loose order.