Temp solution to re-rendering: setTimeout