Untested, but hopefully fixed display code