Core dump fix