- Attempt to fix rendering problems for issue #345