Patch to fix display errors