No-Keep implemented. Included bug fix