Better handling of real dump