If you’re a Galaxy S7 Active owner and the handset’s recent failed Consumer Reports water resistance test has been giving you sleepless nights, then this piece of news should make you feel better.

Samsung claims to have fixed a manufacturing defect in the Galaxy S7 Active that made some handsets unable to sustain water damage despite their IP68 certification. The South Korean handset maker has assured that all Galaxy S7 Active units now being shipped would be problem-free.

Samsung is offering the Galaxy S7 Active to AT&T customers in the US and its marketing materials clearly state that the phone features IP68 certification, just like its siblings, the Galaxy S7 and Galaxy S7 Edge. This means that apart from being dust-resistant, the Galaxy S7 Active should be able to survive immersion in up to 5 feet of water for up to 30 minutes, as advertised by the company.

But earlier this month, when Consumer Reports placed two Galaxy S7 Active units in a water tank pressurized to 2.12 pounds-per-square-inch, the equivalent of less than five feet of water, for 30 minutes, both units failed the test and came out with a flickering screen and moisture inside. On the other hand, the Galaxy S7 and S7 Edge easily passed the test.

Samsung responded to the test results with a press release stating that the Galaxy S7 Active was IP68 certified and its standard limited warranty still applied.

Samsung has now issued a statement to Consumer Reports, claiming that it has detected and fixed a manufacturing problem responsible for the Galaxy S7’s failure in underwater conditions. As per Consumer Reports, citing Samsung PR Philip Berne:

All Galaxy S7 Active phones are manufactured in the same facility in Asia. “We found a problem in the production line that we were able to correct,” he said. He declined to provide details. Phones now being shipped should be problem-free, according to Berne. However, to his knowledge, Galaxy S7 Active devices already in stores were not being removed from inventory.

Samsung has earlier agreed to replace any water-damaged S7 Active unit under its limited warranty.

Has your Galaxy S7 Active been facing any water-resistance problems? Let us know in the comments below!