Snapfix

This is @wgoetz fix to snapshots module. I recreated the Pull Request to have a clean view of the changes.
It is incredible I can do this in the web other's person repository, thanks to github.