Unwanted crash fix