Quick crash fix