Issue 1522: missing comments