Fixing "lakes" issue (hopefully).