Fixes issue #571 I experience design on version 2.0 similar to earlier versions.
Merge pull request #619 from thomasbrix/issue-571

Fixes issue #571 I experience design on version 2.0 similar to earlier v...