Fix Issue 199 - Label causes scope to collapse into parent
Merge pull request #3024 from yebblies/issue199

Issue 199 - Label causes scope to collapse into parent