Client-Side Rendering Bugfix