hopefully fixed a hideous display bug
Merge branch 'hotfix'