Snippet improvement #334