Fixed display work around
Merge remote-tracking branch 'origin/workingBranch'