Merge pull request #538 from mhaskel/lucid_fix