Fixed last rendering issue