FIX::improve performance of click