Trying to be more consistent with render behavior