Changed snippet behavior, is this better?