try #2 at click bug fix