Fix for AClic (copy version from master)