Resolve #18 - Memento