General: Fixed rendering issue