Fix for Lucid