lightning hack on #22