Comment only handler introduced and fixed