Duplicating the above bit of logic really, wonder if we can refactor? That breakpoint caveat makes it tricky though, so maybe not