Latest Jokermon changes
Fix a crash caused by the previous update
Earlier changes on GitHub