Fix second instance as well