Added fix for clicks when it parameter is null.