Relates to #591, use more specific regexp
snapshot