This is hopefully the last rendering fix