Dreamer fix-up