This should fix #2 (crash on startup).