Possibly fixed a crash