Fix clicks issue