Solve a bug with first and second click