Added a fix for lightning