Fixed pass at fixing rendering error
Fixed rendering error