Added short circuit memento filtering for #25