An attempt to fix rendering