Not re-rendering gave problems in some cases