Fix OOB experience