Fixed rendering issue