Finally, one more API fix and the snapshot view should be golden