issue #5183, fix Layout visit issue
Merge pull request #6859 from andyque/fixLayoutVisit

issue #5183, fix Layout visit issue