More fixed for lucid