Fixing bug: clicks on grid are still taken into account