Yeah they were standard in s2's for sure, not 100% about s1's though, one of my old ones was exactly the same and we discovers it was the wrong tank, was fine after it was replaced