Fix clpass functionality