Support snapshot windows

Well no reason you didn't look at it Mark - I never created the PR. Apologies.

I think it is two bugs that happen to cancel each other out.