FIXED THE FUCKING CRASH!!!!!111!!!!

This needs further testing though. The best use-case(Atropatene) didn't
crash for 10 years.