Fix expected values clickthrough bug