Try to fix this crash.. Again !