Fast crashfix
