Second attempt to fix rendering