merging a comment added in 1.4