improve schema mode compatibility