Fixed major render bug