Merge pull request #539 from mhaskel/lucid_fix