Fixed rendering issue a little bit