Fixed issues with graph wiping