Fixing the descriptor counting