Snippet fix II