New bill to close water loophole