Fixed render issue