Adding server rendering fix