Fixed rendering issue with a work around.