Fix so that app doesn't crash now.