Commentary, bug799