#1176: update vs comments