One additonal change to prevent crashing