Apply a quick fix to the core dump issue