Fixed legend overflow issue in #2076 with the fix proposed by @patheard.
Merge pull request #2099 from pjackson28/v3.0

Fixed legend overflow issue in #2076 with the fix proposed by @patheard