Fixed Issue #1159 - Bug Redrawing Legend when using custom container