Fix optimization bug add coverage plus