Fix Lightning only working with RPG
1.6.0 BETA 3