Hopefully fix render issue