Possily fixed a crash