Quick crash fix.  TODO: Fix this for real