Fixed inconsistency in server and clientside rendering