Fix setext bug and revert to old controller logic