Fix to use Benjamin's new Clickstack