Has the drinking (tap) water issue been resolved?