Fix for assoc-exists issue