Lighthouse 809 patch

resubmit clean pull request