Fixed bug with click through event