Magic

The last commit fixes a character creation crash that was brought to my attention.