Fix a crash but somewhere...