Fixed expand all bug