Fixed issues with wrong dumping