Fixes #34 Crash with California