#607: More clarification