Fixed dump logic