This should make a difference to gh-196. It might even fix it (depending on what snapshot the user had there).